Auto merge of #4138 - alexcrichton:fix-tests, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 7 Jun 2017 15:42:07 +0000 (15:42 +0000)
committerbors <bors@rust-lang.org>
Wed, 7 Jun 2017 15:42:07 +0000 (15:42 +0000)
Fix tests on beta

Had a few usages of `-Z` leak out of the nightly channel.


Trivial merge